fix css + bugs + classes