Simplify redirection layout