adjust block to no longer use strings, and remove unneeded code
Remove unecessary items and reorder dropdown