Cleanup of layout and admin improvements