minor changes to desktop page
Major changes to desktop page1
Merging issue-6 into develop and resolving conflicts