working on UI navigation changes