Refining and testing the grid

Added reset-width argument to Container mixing, added HiDPI queries