Minor tidy up of layout.