changed the style and fixed some bugs