updating config file
major css changes to the desktop page
Merged issue-2 into develop and resolved conflicts