Refactor CSS & removed unused classes