Clean Slate coding

Started with clean coding and up to the forms.
Had been getting sidetracked in modals and other features decided i need
to get the base code first.