Changed Layout, fixed Store Links