Layout change

Minor layout changes with regards to spacing of elements