Minor layout and admin improvements