Tweaked string_short and templates