Removal of many method collisions. Addition of links and buttons methods.