Refactored the grid drawing app so it plays well with the incoming code. Changed the default layouts