Few more additions to the UI