fixes css issues
fixes
fix for connection
fixes
Merge branch 'master' into integration