clean up utilisation and various CSS changes