Rework/update some styles