Organised template helper functions and made a small CSS change
Submit button fix