Solved conflicts and fixed height on squares container