Moved styles into classes