Form tidying
Added back logo