Cleanup of Menu item/Layout