User experience troy

Wrote tests mostly. Some small changes for UX stuff.