Revert desktop changes.
Merge pull request #866 from ngodfraind/revert-desktop-layout-changes

Revert desktop changes.