Updated CSS, rendering, classes