Move .advert-slot into modules. Other tiny changes