Overhauls to GridContainer and some of the Base, still trying to resolve some buggy behavior