Cleaned up dynamic grid width

Still need to get grid height to adjust and reposition dynamically