added Button and Link. minor cleanup. renamed behaviour to behavior