WIDGET LAYOUT IMPROVEMENT