simplify layout, add links