Much better way of dealing with the different kinds of blocks, and the menu is improving.