Fixed indentation in some admin views
Some code cleanup