Lots of small changes

Warning - Inline Styles left to be cleaned and finalized later