moved some of the link stuff around, added edit and delete capabilities