removed common controller and layout