Fixed layout issues, and form rearrangement, handing over to adam to change mentor list

Signed-off-by: conorbrady393 <conor.brady393@gmail.com>