Merge "Add ui option to startup"