farther changes to improve system and admin console