Improve UI and redirections