desktop layout complete - with some stylistic changes