Fix router + add controller