Fixed up admin presentation a bit. Other small fixes