UI Tweaks and fix concatenation of QuerySets