fixed bugs added styles