fixed some bugs and styles