Administration page fixes