Rework desktop header