Added new layout to filter page with modal selection. Needs more UI work. fixes #91 #108