ActiveAdmin & small fixes