Restructure CSS, mostly same look