Configuration template - further UI improvements