Refactored forms and added column layout