Initial draft of Grid changes with pager

This contains grid+pager initial changes