Fixes and CSS fixes