fixed case when no pubs or ds exist yet, fixed js so that unclick removes button