add owner controller and refactor links