bugs
improving styles