Better fix deskbar mode and a bit of code style..