Further CSS Optimisation and simplified positioning of elements