Move layout and paginator controll to the Base module