Update 1

Still trying to figure out how to move the yellow block, but at least
the blocks are not overlapping each other anymore.