Added styles and fixed some bugs