Updating UI as per Design

# Issue #63 
## Do not Review
## Do not test