UI, order of elements fixed.
Merge origin/master