WIP: styling updates