Fixes and CSS