Rename APP ID, UI edits