added some styles and fixed some bugs...