User settings layout improvements

TP#1558