The cvhanges from Guarav + desktop Program reviews
Merge pull request #61 from yogeshchaugule/design

Design - changes by Sonia and Gaurav