Layout and widget alignement improved