Form design and button fixes