Get rid of double title and other popup and form tweaks