Layout weight
UX improvements