Small ui-layout style tightening, misc template cleanups