moved users and website subunits out to act as disctinct apps
misc minor adjustments to views & templates after moving the two apps in prev commit