Further buttons and forms cleanup