Merge Miku's changes on the UI