Added some organizing changing in css