CSS Updates and cleanup