Improved widget layout