Changed UI for the app - Khang