revised grid layout, removed redundancies