fix css classes
refactor and fix bugs