Final fixes to store admin UI