added UI and linking changes