active_admin added and some fixes.