Implemented better simple form layout solution