Changes to 4.1 admin gui since last merge