Changed layout, added links