added container view with delegate
old category removed
minor fixes