CSS: Fixes/Improvments