fixes
finalizing fixes
finalizing fixes css
semi final