Improve redirect widget