Various updates to UI
About to move auto into regular repo