Added more functional changes to the ui design