Article part mostly done, Main activity changes boecause of constructor changes so they can pas tab-control, templates refactored abit