Adding a desktop mode and more

See commits below for further details. Eclipse reformatted my code, that's why Git thinks that large parts of the code changed