Added CSS Styles and fixed some bugs