Making some widget friendly tweaks for new layout