Code reorgonize
CSS improvments