Some hacky fixes to bad merges on desktop.css