reshape menu to be a rectangle, additional logic fixes