Added address controller
Fixed navigation

Signed-off-by: Alexey Korolev <akorolex@gmail.com>