General tidy up

Updated layout, added email to user, still some errors with unique
validation