Some tweaks, adding fluid grid