Updated styling (still more work to do)