Fixed the UI and Route issue
Merge pull request #297 from aptara/Sushil

Fixed the UI and Route issue
Merge pull request #298 from aptara/Phase2_Sprint1

Phase2 sprint1