GSF : Mainly aesthetics fixes following the latest re-organisation

This is mainly aesthetics fixes after the latest developments/re-organisation got merged.