CSS Cleaned up and Optimised