Refactor
Fix form buttons and misc. other elements to be more accurate