final fixes for admin menu, a little main UI cleanup.