Added some css and TODO's