Modified a layout, and some links