Changed the form layout
Added a TODO file