Some UI navigation was added
Solved merge conflicts