Includes various fixes, as well as adding UI elements for desktop usage.

Includes various fixes, as well as adding UI elements for desktop usage.