Prepare for desktop elements

Prepare the ground for desktop elements.

Issue: #87