Merge topics controller

some tiny bits of refactoring.. too lazy for moar :D