Fix and cleanup CSS/HTML issues with