Changed css organization