18th commit

Big changes on admin.py