Milestone 4 5

All desktop issues from card #213