Pull request for: Ui changes