Added triangle buttons etc
conflict fix