Reorder styles to be more logic