Changed the layout of a button and fixed the validations that were commented out, noticed by Jihan