Few more changes to the UI