Grid-layout: Replaced ui-bar-e class where necessary