Cleanup and update

Compatible with new ActiveAdmin for Rails4