Improve UI navigation
UPDATE_DEPENDENCIES
Remove unused code