Rearranged some CSS classes