Refactor ui

I don't think the navigateTo needs to be set here