Removing filters and includes for now to ease complexity. Also fixed up attributes.
Minor updates and hacks about the modal.