improved some broken layouts, which got broken recently.