fixed some bugs added styles