Css and some bugs fix