removed layout specification from controller and extended admin controller