Have to work on removing grid and adding fluid grid