template chooser and UI adjustments