Updated FlowLayout and ImageMenuItem