Ui changes

Pull request for ui and master