WIP styling updates