UI Updates and Bug fixes in preparation for Blaze/Spacebars