Move more styling into separate CSS file