Made small changes to UI and small functional changes