css fixes
css updates
branch merge