Fixed a bug, and done some css