Add form controls, styles
Layout and styling reorg