Improvements to widget layout