Updated UI To match with current mockups