Refactored buttons and submit buttons