admin area code + other improvements