Removed use of 'render_to_response' from admin
Cleanup, refactor logic