Adjutments to form layout