Only have One form

[torch2424]

@davidnuon Would like one form with the check boxes instead of two, to avoid a pain point, and also, would like the height animations removed. possibly be replaced by another cool animation