Added ActiveAdmin & fixed some caching issues