Restructure CSS and update content