Fixed MenuPanel and Partition