minor tweaks to views and templates