[Rupesh] - UI changes committed.
[Rupesh] - Committing the UI changes after resolving conflicts
[Rupesh] - committing the styles in the right files