news refactor and some adverts added