Consolidated grid layout and reduced css complexity