Removed need for manual addition of heading and panel classes