Changed layout, added gesture rec