Admin ui

This request is to merge admin_ui into master.