Minor Fixes and CSS cleanup