Basic layout for desktop #6

fixes #6 
push to master