spacing fixes and add some colours