More additions to UI